From a7054a9cd820aa0a7b2307591c21a83a36582358 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 13 May 2005 11:11:30 +0000 Subject: [PATCH] * Deprecated the {{msg:}} syntax for inclusion from the Template namespace. --- RELEASE-NOTES | 1 + includes/MagicWord.php | 57 +++++++++++++++++++-------------------- includes/Parser.php | 4 --- languages/Language.php | 1 - languages/LanguageBe.php | 1 - languages/LanguageBg.php | 1 - languages/LanguageCy.php | 1 - languages/LanguageEt.php | 1 - languages/LanguageFo.php | 1 - languages/LanguageGa.php | 1 - languages/LanguageLt.php | 1 - languages/LanguageNds.php | 1 - languages/LanguageNn.php | 1 - languages/LanguageNv.php | 1 - languages/LanguageRo.php | 1 - languages/LanguageRu.php | 1 - languages/LanguageSr.php | 1 - languages/LanguageTt.php | 1 - 18 files changed, 29 insertions(+), 48 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 4853a3f1c4..e9238c6519 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -157,6 +157,7 @@ Various bugfixes, small features, and a few experimental things: * $wgStyleSheetDirectory is no longer an alias for $wgStyleDirectory; * Special:Movepage can now take paramaters like Special:Movepage/Page_to_move (used to just be able to take paramaters via a GET request like index.php?title=Special:Movepage&target=Page_to_move) +* Deprecated the {{msg:template}} syntax for referring to templates * ...and more! diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 5c53c8bba7..4c1f9a9f52 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -23,35 +23,34 @@ define('MAG_CURRENTDAYNAME', 8); define('MAG_CURRENTYEAR', 9); define('MAG_CURRENTTIME', 10); define('MAG_NUMBEROFARTICLES', 11); -define('MAG_MSG', 12); -define('MAG_SUBST', 13); -define('MAG_MSGNW', 14); -define('MAG_NOEDITSECTION', 15); -define('MAG_END', 16); -define('MAG_IMG_THUMBNAIL', 17); -define('MAG_IMG_RIGHT', 18); -define('MAG_IMG_LEFT', 19); -define('MAG_IMG_NONE', 20); -define('MAG_IMG_WIDTH', 21); -define('MAG_IMG_CENTER', 22); -define('MAG_INT', 23); -define('MAG_FORCETOC', 24); -define('MAG_SITENAME', 25); -define('MAG_NS', 26); -define('MAG_LOCALURL', 27); -define('MAG_LOCALURLE', 28); -define('MAG_SERVER', 29); -define('MAG_IMG_FRAMED', 30); -define('MAG_PAGENAME', 31); -define('MAG_PAGENAMEE', 32); -define('MAG_NAMESPACE', 33); -define('MAG_TOC', 34); -define('MAG_GRAMMAR', 35); -define('MAG_NOTITLECONVERT', 36); -define('MAG_NOCONTENTCONVERT', 37); -define('MAG_CURRENTWEEK', 38); -define('MAG_CURRENTDOW', 39); -define('MAG_REVISIONID', 40); +define('MAG_SUBST', 12); +define('MAG_MSGNW', 13); +define('MAG_NOEDITSECTION', 14); +define('MAG_END', 15); +define('MAG_IMG_THUMBNAIL', 16); +define('MAG_IMG_RIGHT', 17); +define('MAG_IMG_LEFT', 18); +define('MAG_IMG_NONE', 19); +define('MAG_IMG_WIDTH', 20); +define('MAG_IMG_CENTER', 21); +define('MAG_INT', 22); +define('MAG_FORCETOC', 23); +define('MAG_SITENAME', 24); +define('MAG_NS', 25); +define('MAG_LOCALURL', 26); +define('MAG_LOCALURLE', 27); +define('MAG_SERVER', 28); +define('MAG_IMG_FRAMED', 29); +define('MAG_PAGENAME', 30); +define('MAG_PAGENAMEE', 31); +define('MAG_NAMESPACE', 32); +define('MAG_TOC', 33); +define('MAG_GRAMMAR', 34); +define('MAG_NOTITLECONVERT', 35); +define('MAG_NOCONTENTCONVERT', 36); +define('MAG_CURRENTWEEK', 37); +define('MAG_CURRENTDOW', 38); +define('MAG_REVISIONID', 39); $wgVariableIDs = array( MAG_CURRENTMONTH, diff --git a/includes/Parser.php b/includes/Parser.php index c24cb82439..fc6db01c67 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -2032,10 +2032,6 @@ class Parser $mwMsgnw =& MagicWord::get( MAG_MSGNW ); if ( $mwMsgnw->matchStartAndRemove( $part1 ) ) { $nowiki = true; - } else { - # Remove obsolete MSG: - $mwMsg =& MagicWord::get( MAG_MSG ); - $mwMsg->matchStartAndRemove( $part1 ); } # Check if it is an internal message diff --git a/languages/Language.php b/languages/Language.php index 9720534134..40db87cae3 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -225,7 +225,6 @@ $wgLanguageNamesEn =& $wgLanguageNames; MAG_PAGENAME => array( 1, 'PAGENAME' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ), MAG_NAMESPACE => array( 1, 'NAMESPACE' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__' ), diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php index 186a9d5e5d..2cb6eb041d 100644 --- a/languages/LanguageBe.php +++ b/languages/LanguageBe.php @@ -67,7 +67,6 @@ require_once('LanguageUtf8.php'); MAG_PAGENAME => array( 1, 'PAGENAME', 'НАЗВА_СТАРОНКІ' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE', 'НАЗВА_СТАРОНКІ_2' ), MAG_NAMESPACE => array( 1, 'NAMESPACE', 'ПРАСТОРА_НАЗВАЎ'), - MAG_MSG => array( 0, 'MSG:', 'ПАВЕДАМЛЕНЬНЕ:' ), MAG_SUBST => array( 0, 'SUBST:', 'ПАДСТАНОЎКА:'), MAG_MSGNW => array( 0, 'MSGNW:', 'ПАВЕДАМЛЕНЬНЕ_БЯЗЬ_ВІКІ:' ), MAG_END => array( 0, '__END__', '__КАНЕЦ__' ), diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php index ffd1296a11..cf3af60b37 100644 --- a/languages/LanguageBg.php +++ b/languages/LanguageBg.php @@ -73,7 +73,6 @@ MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ), MAG_PAGENAME => array( 1, 'PAGENAME', 'СТРАНИЦА' ), MAG_NAMESPACE => array( 1, 'NAMESPACE', 'ИМЕНПРОСТРАНСТВО' ), - MAG_MSG => array( 0, 'MSG:', 'СЪОБЩ:' ), MAG_SUBST => array( 0, 'SUBST:', 'ЗАМЕСТ:' ), MAG_MSGNW => array( 0, 'MSGNW:', 'СЪОБЩNW:' ), MAG_END => array( 0, '__END__', '__КРАЙ__' ), diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php index 9f02f148a6..aad7cc0a85 100644 --- a/languages/LanguageCy.php +++ b/languages/LanguageCy.php @@ -66,7 +66,6 @@ MAG_CURRENTTIME => array( 1, "CURRENTTIME", "AMSERCYFOES" ), MAG_NUMBEROFARTICLES => array( 1, "NUMBEROFARTICLES","NIFEROERTHYGLAU" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "CURRENTMONTHNAMEGEN", "GENENWMISCYFOES" ), - MAG_MSG => array( 1, "MSG:" ), MAG_SUBST => array( 1, "SUBST:" ), MAG_MSGNW => array( 0, "MSGNW:" ), MAG_END => array( 0, "DIWEDD" ), diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php index fac402f2d3..4a6abb3c09 100644 --- a/languages/LanguageEt.php +++ b/languages/LanguageEt.php @@ -74,7 +74,6 @@ $wgNamespaceNamesEt = array( MAG_PAGENAME => array( 1, 'PAGENAME' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ), MAG_NAMESPACE => array( 1, 'NAMESPACE' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__' ), diff --git a/languages/LanguageFo.php b/languages/LanguageFo.php index fd08a0f9f5..e5c4aefba9 100644 --- a/languages/LanguageFo.php +++ b/languages/LanguageFo.php @@ -81,7 +81,6 @@ require_once( 'LanguageUtf8.php'); MAG_PAGENAME => array( 1, 'PAGENAME' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ), MAG_NAMESPACE => array( 1, 'NAMESPACE' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__' ), diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php index 1a2039dd67..75bde9f581 100755 --- a/languages/LanguageGa.php +++ b/languages/LanguageGa.php @@ -85,7 +85,6 @@ DISCUSSION! MAG_CURRENTTIME => array( 1, "CURRENTTIME", "AMREATHA" ), MAG_NUMBEROFARTICLES => array( 1, "NUMBEROFARTICLES", "MÉIDAILT" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "CURRENTMONTHNAMEGEN" ), #FIXME - what is this? - MAG_MSG => array( 1, "MSG:", "TCHT" ), MAG_SUBST => array( 1, "SUBST:" ), MAG_MSGNW => array( 1, "MSGNW:" ), MAG_END => array( 0, "__END__", "__DEIREADH__" ), diff --git a/languages/LanguageLt.php b/languages/LanguageLt.php index 0fabdcd2ff..517673ff0b 100644 --- a/languages/LanguageLt.php +++ b/languages/LanguageLt.php @@ -40,7 +40,6 @@ require_once( "LanguageUtf8.php" ); MAG_CURRENTTIME => array( 1, "CURRENTTIME" ), MAG_NUMBEROFARTICLES => array( 1, "NUMBEROFARTICLES" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "CURRENTMONTHNAMEGEN" ), - MAG_MSG => array( 0, "MSG:" ), MAG_SUBST => array( 0, "SUBST:" ), MAG_MSGNW => array( 0, "MSGNW:" ), MAG_END => array( 0, "__END__" ), diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php index 5980eaf1fb..4718cec9d5 100644 --- a/languages/LanguageNds.php +++ b/languages/LanguageNds.php @@ -65,7 +65,6 @@ if($wgMetaNamespace === FALSE) MAG_PAGENAME => array( 1, 'PAGENAME', 'SIETNAAM' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE', 'SIETNAAME' ), MAG_NAMESPACE => array( 1, 'NAMESPACE', 'NAAMRUUM' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__', '__ENN__' ), diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php index f1e9a32f42..8119f844a9 100644 --- a/languages/LanguageNn.php +++ b/languages/LanguageNn.php @@ -101,7 +101,6 @@ $wgValidationTypesNn = array ( MAG_PAGENAME => array( 1, 'PAGENAME', 'SIDENAMN', 'SIDENAVN' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE', 'SIDENAMNE', 'SIDENAVNE' ), MAG_NAMESPACE => array( 1, 'NAMESPACE', 'NAMNEROM', 'NAVNEROM' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:', 'LIMINN:' ), MAG_MSGNW => array( 0, 'MSGNW:', 'IKWIKMELD:' ), MAG_END => array( 0, '__END__', '__SLUTT__' ), diff --git a/languages/LanguageNv.php b/languages/LanguageNv.php index c360e8602e..f7e2e85251 100755 --- a/languages/LanguageNv.php +++ b/languages/LanguageNv.php @@ -126,7 +126,6 @@ this (alternative: like this?).', MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ), MAG_PAGENAME => array( 1, 'PAGENAME' ), MAG_NAMESPACE => array( 1, 'NAMESPACE' ), - MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__' ), diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php index 1e96a04442..8931a2f62e 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -70,7 +70,6 @@ require_once("LanguageUtf8.php"); MAG_CURRENTTIME => array( 1, "CURRENTTIME", "{{ORACURENTA}}" ), MAG_NUMBEROFARTICLES => array( 1, "NUMBEROFARTICLES", "{{NUMARDEARTICOLE}}" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "CURRENTMONTHNAMEGEN", "{{NUMELUNACURENTAGEN}}" ), - MAG_MSG => array( 0, "MSG:", "MSJ:" ), MAG_SUBST => array( 0, "SUBST:" ), MAG_MSGNW => array( 0, "MSGNW:", "MSJNOU:" ), MAG_END => array( 0, "__END__", "__FINAL__" ), diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php index e073d35f47..41a584c0cf 100644 --- a/languages/LanguageRu.php +++ b/languages/LanguageRu.php @@ -134,7 +134,6 @@ if(isset($wgExtraNamespaces)) { MAG_PAGENAME => array( 1, 'PAGENAME','НАЗВАНИЕСТРАНИЦЫ'), MAG_PAGENAMEE => array( 1, 'PAGENAMEE','НАЗВАНИЕСТРАНИЦЫ2'), MAG_NAMESPACE => array( 1, 'NAMESPACE','ПРОСТРАНСТВОИМЁН'), - MAG_MSG => array( 0, 'MSG:','СООБЩ:'), MAG_SUBST => array( 0, 'SUBST:','ПОДСТ:'), MAG_MSGNW => array( 0, 'MSGNW:'), MAG_END => array( 0, '__END__','__КОНЕЦ__'), diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php index dfd496dd21..839ff9817c 100644 --- a/languages/LanguageSr.php +++ b/languages/LanguageSr.php @@ -56,7 +56,6 @@ require_once( "LanguageUtf8.php" ); MAG_CURRENTTIME => array( 1, "{{ТРЕНУТНОВРЕМЕ}}" ), MAG_NUMBEROFARTICLES => array( 1, "{{БРОЈЧЛАНАКА}}" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "{{ГЕНЕРИСАНОИМЕТРЕНУТНОГМЕСЕЦА}}"), - MAG_MSG => array( 1, "{{ПОР:$1}}" ), MAG_SUBST => array( 1, "{{ПОДСТ:$1}}" ), MAG_MSGNW => array( 1, "{{НВПОР:$1}}" ) ); diff --git a/languages/LanguageTt.php b/languages/LanguageTt.php index 1c6424c42d..5193c888ef 100644 --- a/languages/LanguageTt.php +++ b/languages/LanguageTt.php @@ -89,7 +89,6 @@ $wgLanguageNamesTt =& $wgLanguageNames; MAG_CURRENTMONTHNAMEGEN => array( 1, 'AĞIMDAĞI_AY_İSEME_GEN' ), MAG_PAGENAME => array( 1, 'BİTİSEME' ), MAG_NAMESPACE => array( 1, 'İSEMARA' ), - MAG_MSG => array( 0, 'STR:' ), MAG_SUBST => array( 0, 'TÖPÇEK:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__AZAQ__' ), -- 2.20.1